bitkeeper revision 1.1159.170.52 (419e281dxhj2vE4hBYI-_Ud4rCMAWg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 19 Nov 2004 17:06:37 +0000 (17:06 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 19 Nov 2004 17:06:37 +0000 (17:06 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk


Trivial merge